bitkeeper revision 1.1159.170.17 (41962d055pOc5fTrHGe4fmt4cHDhjw)
authorkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Sat, 13 Nov 2004 15:49:25 +0000 (15:49 +0000)
committerkaf24@freefall.cl.cam.ac.uk <kaf24@freefall.cl.cam.ac.uk>
Sat, 13 Nov 2004 15:49:25 +0000 (15:49 +0000)
Merge freefall.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/kaf24/xeno


Trivial merge